Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Dec 2011 00:55:53 +0000 (16:55 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Dec 2011 00:55:53 +0000 (16:55 -0800)
commitb13ce0d9f1ff3886357aec7f8d03ca6878dbdaf6
treecc7b38194842132949926e60a9adcd05780f168d
parentedaa8aa22d455b6721bc99ca035b677ad600f8e1
parent5bd737362bfd20626eeb4b81228f8a7f4b8d2984
Merge from trunk.